Auto merge of #2676 - srinivasreddy:refactor, r=alexcrichton

author bors <bors@rust-lang.org>

Sun, 15 May 2016 00:29:02 +0000 (17:29 -0700)

committer bors <bors@rust-lang.org>

Sun, 15 May 2016 00:29:02 +0000 (17:29 -0700)
author bors <bors@rust-lang.org>
Sun, 15 May 2016 00:29:02 +0000 (17:29 -0700)
committer bors <bors@rust-lang.org>
Sun, 15 May 2016 00:29:02 +0000 (17:29 -0700)
diff --cc tests/test_cargo_compile_custom_build.rs
Simple merge
diff --cc tests/tests.rs
Simple merge
author	bors <bors@rust-lang.org>
	Sun, 15 May 2016 00:29:02 +0000 (17:29 -0700)
committer	bors <bors@rust-lang.org>
	Sun, 15 May 2016 00:29:02 +0000 (17:29 -0700)
		1	2
tests/test_cargo_compile_custom_build.rs	patch \|	diff1 \|	diff2 \|	blob \| history
tests/tests.rs	patch \|	diff1 \|	diff2 \|	blob \| history